Zigbee + Matter combined App rework#96
Merged
edmont merged 4 commits intoApr 17, 2026
Merged
Conversation
ArekBalysNordic
force-pushed
the
combined-rework
branch
5 times, most recently
from
5c61577 to
96df761
Compare
Collaborator
|
Just some initial comments about style:
|
Contributor
Author
Will try to configure clang-format to meet these requirements. |
Zigbee deinit releases all resources and deinitializes the Zigbee stack. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
ArekBalysNordic
force-pushed
the
combined-rework
branch
4 times, most recently
from
db9ca27 to
7c5dd25
Compare
Contributor
Author
Thanks, aligned most tabs and spaces, however I guess, we can consider adding .clang-format file to keep everything synchronous. Added all prefixes, and removed outdated description. |
edmont
reviewed
Apr 7, 2026
Collaborator
edmont
left a comment
edmont
left a comment
There was a problem hiding this comment.
Thanks, a few more comments.
Also there is a typo in a commit title: combained --> combined.
| k_msgq_purge(&zb_app_cb_msgq); | ||
| k_poll_signal_reset(&zigbee_sig); | ||
| (void)atomic_clear((atomic_t *)&zb_app_cb_process_scheduled); | ||
| } |
Collaborator
There was a problem hiding this comment.
We might need to cancel tx_done_ack_work for the CONFIG_NRF_802154_SER_HOST case.
Contributor
Author
There was a problem hiding this comment.
Right. However I guess, it fits better to zigbee_nrf_802154_radio_deinit, right?
If nrf802154 callbacks dispatcher is enabled, all zigbee radio callbacks go through it. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
ArekBalysNordic
force-pushed
the
combined-rework
branch
from
7c5dd25 to
574816d
Compare
edmont
reviewed
Apr 13, 2026
ArekBalysNordic
force-pushed
the
combined-rework
branch
from
574816d to
a388b6c
Compare
Contributor
Author
|
@edmont Removed a workaround for crypto, now on ncs v3.3-branch Thread and Zigbee work properly! Tested factory reset, now it works properly NVS is cleared for zigbee. Apart from that, noticed that we cannot initialize buttons both in Matter and Zigbee - it leads to undefined behaviour and race conditions. |
edmont
reviewed
Apr 16, 2026
ArekBalysNordic
force-pushed
the
combined-rework
branch
2 times, most recently
from
d095fca to
b4750b9
Compare
edmont
approved these changes
Apr 17, 2026
Collaborator
edmont
left a comment
edmont
left a comment
There was a problem hiding this comment.
Please rename commit title: manifest: switch to sdk-nrf v3.3.0-RC1 --> rc2
- Created two separate app tasks for Matter and Zigbee. - Combained two protocols in the main.cpp file. - Rework of configuration to be compliant with Matter. - Added a variant to sample.yaml. - Fixed nrf54lm20 configuration. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
- Switched the sdk-nrf revision to v3.3.0-RC2. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
ArekBalysNordic
force-pushed
the
combined-rework
branch
from
b4750b9 to
f987ee3
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.